Merge branch 'upstream'
authorBernd Zeimetz <bernd@bzed.de>
Mon, 21 Sep 2009 22:35:19 +0000 (00:35 +0200)
committerBernd Zeimetz <bernd@bzed.de>
Mon, 21 Sep 2009 22:35:19 +0000 (00:35 +0200)

Trivial merge